Skip to content

Fix wielding two-handed items with only one hand #40966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix wielding two-handed items with only one hand #40966

wants to merge 2 commits into from
+16 −2

Conversation

@slarticodefast
Copy link
Member

About the PR

Title
Thanks to @VerinSenpai for writing an integration test that found this bug.
To reproduce on master:

  • Use the removehand command so that you only have one hand
  • Spawn a baseball bat or mosin
  • successfully wield it despite not having a free hand

Why / Balance

bugfix

Technical details

CanWield was comparing the number of freeable hands. However that included the hand the weapon was held in, which should not count as dropable when trying to wield it.
To fix this we add a new method to count free hands that can ignore a given item when counting.
We cannot just subtract 1 because the weapon itself might be unremoveable.

Media

ss14

Requirements

Breaking changes

Changelog
🆑

  • fix: Fixed being able to wield two-handed weapons when having only one hand.

@PJBot PJBot added S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. size/S Denotes a PR that changes 10-99 lines. labels Oct 18, 2025
@VerinSenpai
Copy link
Contributor

Yowza lmao

@VerinSenpai
Copy link
Contributor

Guess I gotta fix my test afterall 😅

@VerinSenpai VerinSenpai added T: Bugfix Type: Bugs and/or bugfixes P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. A: General Interactions Area: General in-game interactions that don't relate to another area. D3: Low Difficulty: Some codebase knowledge required. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Oct 18, 2025
@Princess-Cheeseballs
Copy link
Member

Not sure if we can just patch this out without breaking things. Monkeys have been able to wield melee weapons and guns for a while which I think is intentional?

In addition holoclowns use this to wield melee weapons too which will be more impactful.

Something something combat workgroup needs to chime in something something. Should be patched out though in favor of hand sizes like FSP suggested.

@slarticodefast
Copy link
Member Author

slarticodefast commented Oct 18, 2025 •
edited
Loading

Seems like a straight up bug to me to be able to wield two-handed weapons with only one hand.
And I don't think we should introduce an exception for that. That would be unintuitive. If holoclowns should be able to wield guns then they should have two hands or the guns should not require wielding.

@VerinSenpai VerinSenpai mentioned this pull request Oct 19, 2025
Closed
2 tasks
@slarticodefast slarticodefast mentioned this pull request Oct 21, 2025
Open
2 tasks
Errant-4
Errant-4 reviewed Oct 23, 2025
View reviewed changes
@VerinSenpai
Copy link
Contributor

Ok I was looking at the requseted changes like I don't remember doing this. I definitely didn't create this method... Oh, this isn't my pr lmao.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Errant-4 Errant-4 Errant-4 left review comments

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

A: General Interactions Area: General in-game interactions that don't relate to another area. D3: Low Difficulty: Some codebase knowledge required. P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. size/S Denotes a PR that changes 10-99 lines. T: Bugfix Type: Bugs and/or bugfixes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@slarticodefast @VerinSenpai @Princess-Cheeseballs @Errant-4 @PJBot